Build the items list after setting the storage file.

2006-04-02  Emmanuele Bassi  <ebassi@cvs.gnome.org>

	* gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build
	the items list after setting the storage file.

	* gtk/gtkrecentmanager.c (display_closed): Use the right string
	for unsetting the default manager object from the screen.

diff --git a/ChangeLog b/ChangeLog
index 5d62183d6b617dec2d6fad05c0dd084ec4e56ea9..56f35dd22e9075294b32fdb5bfbe3ea3ec8ceebd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-04-02  Emmanuele Bassi  <ebassi@cvs.gnome.org>
+
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build
+       the items list after setting the storage file.
+
+       * gtk/gtkrecentmanager.c (display_closed): Use the right string
+       for unsetting the default manager object from the screen.       
+
 2006-04-01  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkfilesel.c (gtk_file_selection_get_filename): Oops. (#336784)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5d62183d6b617dec2d6fad05c0dd084ec4e56ea9..56f35dd22e9075294b32fdb5bfbe3ea3ec8ceebd 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2006-04-02  Emmanuele Bassi  <ebassi@cvs.gnome.org>
+
+       * gtk/gtkrecentmanager.c (gtk_recent_manager_set_filename): Build
+       the items list after setting the storage file.
+
+       * gtk/gtkrecentmanager.c (display_closed): Use the right string
+       for unsetting the default manager object from the screen.       
+
 2006-04-01  Behdad Esfahbod  <behdad@gnome.org>
 
        * gtk/gtkfilesel.c (gtk_file_selection_get_filename): Oops. (#336784)

diff --git a/gtk/gtkrecentmanager.c b/gtk/gtkrecentmanager.c
index 6b727a8f84b146239c4420d8c441364a1dc4e67b..cebcee9d5be8e7950c98247856ed4b89afe3dbdd 100644 (file)
--- a/gtk/gtkrecentmanager.c
+++ b/gtk/gtkrecentmanager.c
@@ -480,13 +480,13 @@ gtk_recent_manager_set_filename (GtkRecentManager *manager,
       manager->priv->poll_timeout = 0;
     }
 
-  build_recent_items_list (manager);
-  
   priv->filename = g_strdup (filename);
   priv->poll_timeout = g_timeout_add (POLL_DELTA,
                                      gtk_recent_manager_poll_timeout,
                                      manager);
 
+  build_recent_items_list (manager);
+  
   priv->is_dirty = FALSE;
 }
 
@@ -685,7 +685,7 @@ display_closed (GdkDisplay       *display,
 
   if (was_screen_singleton)
     {
-      g_object_set_data (G_OBJECT (screen), I_("gtk-recent-manager-error-quark"), NULL);
+      g_object_set_data (G_OBJECT (screen), I_("gtk-recent-manager-default"), NULL);
       priv->is_screen_singleton = FALSE;
     }